Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge wizden up to 18/02 #857

Merged
merged 198 commits into from
Feb 18, 2024
Merged

Conversation

DebugOk
Copy link
Contributor

@DebugOk DebugOk commented Feb 18, 2024

🆑

  • add: Merged upstream
  • fix: Fixed the upstream changelog not rendering

Tunguso4ka and others added 30 commits February 18, 2024 22:34
(cherry picked from commit 6c20938)
Removed emote text

(cherry picked from commit af21657)
(cherry picked from commit 3f0572b)
add

(cherry picked from commit 601da0c)
(cherry picked from commit e57cfea)
* Fix brig timer labels to displaying correctly.

The TextScreenSystem was expecting a string, but the value inputted for
the label was an array of strings.

* Address nitpick

This should do the exact same thing but it is semantically clearer I guess.

(cherry picked from commit 1a3ce6c)
(cherry picked from commit 8422216)
* destructible mop buckets

* remove wwod

* spacing

---------

Co-authored-by: doom <[email protected]>
(cherry picked from commit 717d423)
(cherry picked from commit a6de63c)
* Straw hat.

A craftable, flammable straw hat.

Thats it.

* seems to made it go in flames!

(cherry picked from commit 007adfc)
(cherry picked from commit a81ce94)
* - Renamed GetSortedRootEntries to GetSortedEntries and added child sorting logic
- Removed unessesary Tree.SetAllExpanded(true) call in RepopulateTree

* Adding back deleted setallexpanded call to check if test passes

---------

Co-authored-by: Your Name <[email protected]>
(cherry picked from commit 3b2921a)
(cherry picked from commit 9e79a26)
* Syndicate encryption key grammar fix

An encryption key used by... wait... Who is owner of this chip? > An encryption key used by... wait... Who is the owner of this chip?

* Syndicate key grammar fix

An encryption key used by... wait... Who is owner of this chip? > An encryption key used by... wait... Who is the owner of this chip?

(cherry picked from commit de0d5e4)
Fix comparison

Hybrids (different plants being crossed) are supposed to have a high
chance of becoming seedless to balance overpowered plants.

However, a logic error in the comparison gave seedless to plants when
they were from the same seed (not hybrids) rather than the other way
around.

Reported by:    @genderGeometries

(cherry picked from commit 28755f5)
* Fixed Error with RobustToolbox Edits. Removed the addition of secbelt tag from assault belt.

* Resprite of the monstrosity

* Resprite of the tourniquet NO LONGER PHALLUS SHAPED

* too bright, now darker and edgier

* Tourniquet resprite

* metajson yay

(cherry picked from commit bd4e2c3)
(cherry picked from commit d6c6c1d)
prevent people without permissions from opening the tile, entityspawn, or decal menus

(cherry picked from commit 2293f46)
* laughter

* make clownmobs bleed laughter

* laughin syrup and laughter recipe

* add laughin peas

(cherry picked from commit 667cebe)
(cherry picked from commit 83be213)
* New Drip for the QM

QM beret and QM formal uniform

* Asd

Asd

* Adds the new clothing to the uniform printer

what it says on the tin

* I always forget to update the copyright RAAAAAH

yup

(cherry picked from commit 400036b)
* add

* fix

* aaaa

(cherry picked from commit b07e8ab)
* Flipped caps real

* oops

* whoops

* flip not fold

* fix formatting

* cargosoft formatting

(cherry picked from commit f7a3ea6)
(cherry picked from commit 1be7865)
Lowers beanbag damage from 55 stam to 30 stam

(cherry picked from commit cc5f45b)
(cherry picked from commit 98015a4)
PJBot and others added 19 commits February 18, 2024 23:37
(cherry picked from commit 3beb01b)
I could've sworn I corrected this before committing but guess not ???

(cherry picked from commit 71713fd)
* added evidence markers

* box tweak

* fixed a spelling mistake

* new sprites, tweaked yml too

(cherry picked from commit 07b796d)
* add

* yes

(cherry picked from commit 22244b3)
(cherry picked from commit cb32a84)
This is a visualizer somewhat similar to the Generic. It allows configuring appearance info based on specific CVars the user has set. This allows YAML to easily configure alternatives for accessibility CVars like reduced motion.

(cherry picked from commit 1ce2155)
spelling error

(cherry picked from commit d4c68a9)
Important fixes from the UI PR

(cherry picked from commit e493007)
* Add Flammable Touch Reaction for liquid tritium

* Stop tail wagging action on crit

* Revert "Add Flammable Touch Reaction for liquid tritium"

This reverts commit 41be57b058a0cdee0cecfc51eb1c4a25631e62f3.

(cherry picked from commit e8eddf5)
(cherry picked from commit fa09f7a)
add (un)equip sounds to EVA helms

(cherry picked from commit aadf749)
(cherry picked from commit a361e6a)
fixes

makes the newton cradle not able to decimate ears while also adding it to the bureaucracy crate and lowering its volume and range a little bit

(cherry picked from commit 110437c)
(cherry picked from commit 8ea30ca)
Enabling "reduced motion" now makes the smoke effects not animate. This helps some people with vision issues.

(cherry picked from commit 0c8e617)
(cherry picked from commit 0dd381a)
@DebugOk DebugOk enabled auto-merge February 18, 2024 22:56
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: UI Changes: YML Changes any yml files labels Feb 18, 2024
@DebugOk DebugOk merged commit cfdc0f0 into DeltaV-Station:master Feb 18, 2024
10 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Feb 18, 2024
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Changes some outfits, notably the Operative Jumpskirt, Kimono,
Dark/Light Monastic Robes, and the Gladiator Uniform to be assigned as
skirts, rather than suits. This allows harpies to wear them. In
addition, the UnsensoredClothingSkirtBase base now possesses the
'ClothMade' tag, allowing moths to eat outfits with this base.

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- tweak: Fixes a few typos in outfit descriptions
- fix: The Kimono, Dark/Light Monastic Robes, Gladiator Uniform, and
Operative Jumpskirt should be properly considered jumpskirts, and are by
extension wearable for harpies.
- fix: Moths should be able to eat outfits with the
UnsensoredClothingSkirtBase parent.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: UI Changes: YML Changes any yml files
Projects
None yet
Development

Successfully merging this pull request may close these issues.